From ad3773b2e12a839fef2ac01f572f6490d1ca5f64 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 16 Mar 2019 21:49:24 -0400 Subject: [PATCH] a11y tests: Update expected results The changes here are all related to initial focus. --- testsuite/a11y/about.txt | 4 ++-- testsuite/a11y/accessible-name.txt | 4 ++-- testsuite/a11y/actionbar.txt | 4 ++-- testsuite/a11y/assistant.txt | 2 +- testsuite/a11y/buttons.txt | 4 ++-- testsuite/a11y/calendar.txt | 4 ++-- testsuite/a11y/colorchooser.txt | 4 ++-- testsuite/a11y/combos.txt | 2 +- testsuite/a11y/entries.txt | 2 +- testsuite/a11y/expander.txt | 4 ++-- testsuite/a11y/headerbar.txt | 4 ++-- testsuite/a11y/hello-world.txt | 4 ++-- testsuite/a11y/iconview.txt | 4 ++-- testsuite/a11y/label-static.txt | 4 ++-- testsuite/a11y/label.txt | 4 ++-- testsuite/a11y/link.txt | 4 ++-- testsuite/a11y/listbox.txt | 4 ++-- testsuite/a11y/lockbutton.txt | 4 ++-- testsuite/a11y/menubutton.txt | 4 ++-- testsuite/a11y/menubutton2.txt | 4 ++-- testsuite/a11y/menubutton3.txt | 4 ++-- testsuite/a11y/menus.txt | 8 ++++++++ testsuite/a11y/mnemonic.txt | 2 +- testsuite/a11y/notebook.txt | 4 ++-- testsuite/a11y/pickers.txt | 2 +- testsuite/a11y/placeholder-text.txt | 8 ++++---- testsuite/a11y/range.txt | 4 ++-- testsuite/a11y/scale-drawvalue.txt | 4 ++-- testsuite/a11y/stack.txt | 4 ++-- testsuite/a11y/text.txt | 4 ++-- testsuite/a11y/tooltips.txt | 4 ++-- testsuite/a11y/tree.txt | 10 +++++----- 32 files changed, 70 insertions(+), 62 deletions(-) diff --git a/testsuite/a11y/about.txt b/testsuite/a11y/about.txt index 165234e97a..5add6017ca 100644 --- a/testsuite/a11y/about.txt +++ b/testsuite/a11y/about.txt @@ -2,7 +2,7 @@ window1 "dialog" index: 0 name: About FancyPants - state: enabled sensitive showing visible + state: active enabled sensitive showing visible toolkit: gtk window-type: dialog @@ -374,7 +374,7 @@ See the GNU General Public License, version 3 or later for details. parent: stack_switcher index: 0 name: About - state: checked enabled focusable sensitive showing visible + state: checked enabled focusable focused sensitive showing visible toolkit: gtk layer: widget diff --git a/testsuite/a11y/accessible-name.txt b/testsuite/a11y/accessible-name.txt index 1c5be98fb8..f2274db1e5 100644 --- a/testsuite/a11y/accessible-name.txt +++ b/testsuite/a11y/accessible-name.txt @@ -1,7 +1,7 @@ window1 "window" index: 0 - state: enabled resizable sensitive showing visible + state: active enabled resizable sensitive showing visible toolkit: gtk window-type: normal @@ -12,7 +12,7 @@ window1 parent: window1 index: 0 name: Accessible name - state: enabled focusable sensitive showing visible + state: enabled focusable focused sensitive showing visible toolkit: gtk layer: widget diff --git a/testsuite/a11y/actionbar.txt b/testsuite/a11y/actionbar.txt index c5323a4f29..abd273cb1c 100644 --- a/testsuite/a11y/actionbar.txt +++ b/testsuite/a11y/actionbar.txt @@ -1,7 +1,7 @@ window1 "window" index: 0 - state: enabled resizable sensitive showing visible + state: active enabled resizable sensitive showing visible toolkit: gtk window-type: normal @@ -21,7 +21,7 @@ window1 parent: unnamed-GtkContainerAccessible-0 index: 0 name: Start 1 - state: enabled focusable sensitive showing visible + state: enabled focusable focused sensitive showing visible toolkit: gtk layer: widget diff --git a/testsuite/a11y/assistant.txt b/testsuite/a11y/assistant.txt index 6de0d4f1c3..022637ed4a 100644 --- a/testsuite/a11y/assistant.txt +++ b/testsuite/a11y/assistant.txt @@ -13,7 +13,7 @@ window1 parent: content index: 0 name: Page 1 - state: enabled focusable sensitive showing visible + state: enabled focusable focused sensitive showing visible toolkit: gtk layer: widget diff --git a/testsuite/a11y/buttons.txt b/testsuite/a11y/buttons.txt index 0a43e143c6..30d0a3ff12 100644 --- a/testsuite/a11y/buttons.txt +++ b/testsuite/a11y/buttons.txt @@ -1,7 +1,7 @@ window1 "window" index: 0 - state: enabled resizable sensitive showing visible + state: active enabled resizable sensitive showing visible toolkit: gtk window-type: normal @@ -21,7 +21,7 @@ window1 parent: grid1 index: 0 name: Hello World! - state: checked enabled focusable sensitive showing visible + state: checked enabled focusable focused sensitive showing visible toolkit: gtk layer: widget diff --git a/testsuite/a11y/calendar.txt b/testsuite/a11y/calendar.txt index 768d6c479d..f9e6a18c3b 100644 --- a/testsuite/a11y/calendar.txt +++ b/testsuite/a11y/calendar.txt @@ -1,7 +1,7 @@ window1 "window" index: 0 - state: enabled resizable sensitive showing visible + state: active enabled resizable sensitive showing visible toolkit: gtk window-type: normal @@ -11,7 +11,7 @@ window1 "calendar" parent: window1 index: 0 - state: enabled focusable sensitive showing visible + state: enabled focusable focused sensitive showing visible toolkit: gtk layer: widget diff --git a/testsuite/a11y/colorchooser.txt b/testsuite/a11y/colorchooser.txt index d1dc6adce6..b509b61519 100644 --- a/testsuite/a11y/colorchooser.txt +++ b/testsuite/a11y/colorchooser.txt @@ -2,7 +2,7 @@ window1 "dialog" index: 0 name: Select a Color - state: enabled sensitive showing visible + state: active enabled sensitive showing visible toolkit: gtk window-type: dialog @@ -58,7 +58,7 @@ window1 parent: unnamed-GtkContainerAccessible-1 index: 0 name: Light Scarlet Red - state: enabled focusable sensitive showing visible + state: enabled focusable focused sensitive showing visible toolkit: gtk layer: widget diff --git a/testsuite/a11y/combos.txt b/testsuite/a11y/combos.txt index 490ecd390b..3d635149dc 100644 --- a/testsuite/a11y/combos.txt +++ b/testsuite/a11y/combos.txt @@ -1,7 +1,7 @@ window1 "window" index: 0 - state: enabled resizable sensitive showing visible + state: active enabled resizable sensitive showing visible toolkit: gtk window-type: normal diff --git a/testsuite/a11y/entries.txt b/testsuite/a11y/entries.txt index 3fc7c7ee99..342b557ec8 100644 --- a/testsuite/a11y/entries.txt +++ b/testsuite/a11y/entries.txt @@ -1,7 +1,7 @@ window1 "window" index: 0 - state: enabled resizable sensitive showing visible + state: active enabled resizable sensitive showing visible toolkit: gtk window-type: normal diff --git a/testsuite/a11y/expander.txt b/testsuite/a11y/expander.txt index 6a66719dde..5f6ac1ed38 100644 --- a/testsuite/a11y/expander.txt +++ b/testsuite/a11y/expander.txt @@ -1,7 +1,7 @@ window1 "window" index: 0 - state: enabled resizable sensitive showing visible + state: active enabled resizable sensitive showing visible toolkit: gtk window-type: normal @@ -12,7 +12,7 @@ window1 parent: window1 index: 0 name: Reveal this - state: enabled expandable focusable sensitive showing visible + state: enabled expandable focusable focused sensitive showing visible toolkit: gtk layer: widget diff --git a/testsuite/a11y/headerbar.txt b/testsuite/a11y/headerbar.txt index 1905c05131..6a933d0110 100644 --- a/testsuite/a11y/headerbar.txt +++ b/testsuite/a11y/headerbar.txt @@ -1,7 +1,7 @@ window1 "window" index: 0 - state: enabled resizable sensitive showing visible + state: active enabled resizable sensitive showing visible toolkit: gtk window-type: normal @@ -21,7 +21,7 @@ window1 parent: headerbar1 index: 0 name: Yes - state: enabled focusable sensitive showing visible + state: enabled focusable focused sensitive showing visible toolkit: gtk layer: widget diff --git a/testsuite/a11y/hello-world.txt b/testsuite/a11y/hello-world.txt index 76119e2099..a3816eda2e 100644 --- a/testsuite/a11y/hello-world.txt +++ b/testsuite/a11y/hello-world.txt @@ -1,7 +1,7 @@ window1 "window" index: 0 - state: enabled resizable sensitive showing visible + state: active enabled resizable sensitive showing visible toolkit: gtk window-type: normal @@ -12,7 +12,7 @@ window1 parent: window1 index: 0 name: Hello World! - state: enabled focusable sensitive showing visible + state: enabled focusable focused sensitive showing visible toolkit: gtk layer: widget diff --git a/testsuite/a11y/iconview.txt b/testsuite/a11y/iconview.txt index eebac50f42..760937982f 100644 --- a/testsuite/a11y/iconview.txt +++ b/testsuite/a11y/iconview.txt @@ -1,7 +1,7 @@ window1 "window" index: 0 - state: enabled resizable sensitive showing visible + state: active enabled resizable sensitive showing visible toolkit: gtk window-type: normal @@ -11,7 +11,7 @@ window1 "layered pane" parent: window1 index: 0 - state: enabled focusable sensitive showing visible + state: enabled focusable focused sensitive showing visible toolkit: gtk layer: widget diff --git a/testsuite/a11y/label-static.txt b/testsuite/a11y/label-static.txt index eff7a8e47c..885522437c 100644 --- a/testsuite/a11y/label-static.txt +++ b/testsuite/a11y/label-static.txt @@ -1,7 +1,7 @@ window1 "window" index: 0 - state: enabled resizable sensitive showing visible + state: active enabled resizable sensitive showing visible toolkit: gtk window-type: normal @@ -12,7 +12,7 @@ window1 parent: window1 index: 0 name: Go to the GTK+ website or >google it - state: enabled focusable multi-line sensitive showing visible has-tooltip + state: enabled focusable focused multi-line sensitive showing visible has-tooltip toolkit: gtk layer: widget diff --git a/testsuite/a11y/label.txt b/testsuite/a11y/label.txt index cf01c56f2f..2875ee2d14 100644 --- a/testsuite/a11y/label.txt +++ b/testsuite/a11y/label.txt @@ -1,7 +1,7 @@ window1 "window" index: 0 - state: enabled resizable sensitive showing visible + state: active enabled resizable sensitive showing visible toolkit: gtk window-type: normal @@ -12,7 +12,7 @@ window1 parent: window1 index: 0 name: Go to the GTK+ website or >google it - state: enabled focusable multi-line sensitive showing visible has-tooltip + state: enabled focusable focused multi-line sensitive showing visible has-tooltip toolkit: gtk layer: widget diff --git a/testsuite/a11y/link.txt b/testsuite/a11y/link.txt index dcd795b596..4d8ff1ad7e 100644 --- a/testsuite/a11y/link.txt +++ b/testsuite/a11y/link.txt @@ -1,7 +1,7 @@ window1 "window" index: 0 - state: enabled resizable sensitive showing visible + state: active enabled resizable sensitive showing visible toolkit: gtk window-type: normal @@ -12,7 +12,7 @@ window1 parent: window1 index: 0 name: Hello World! - state: enabled focusable sensitive showing visible visited has-tooltip + state: enabled focusable focused sensitive showing visible visited has-tooltip toolkit: gtk layer: widget diff --git a/testsuite/a11y/listbox.txt b/testsuite/a11y/listbox.txt index 366d3341e6..46c5abce48 100644 --- a/testsuite/a11y/listbox.txt +++ b/testsuite/a11y/listbox.txt @@ -1,7 +1,7 @@ window1 "window" index: 0 - state: enabled resizable sensitive showing visible + state: active enabled resizable sensitive showing visible toolkit: gtk window-type: normal @@ -30,7 +30,7 @@ window1 "list item" parent: listbox1 index: 0 - state: enabled focusable sensitive showing visible + state: enabled focusable focused sensitive showing visible toolkit: gtk layer: widget diff --git a/testsuite/a11y/lockbutton.txt b/testsuite/a11y/lockbutton.txt index fef97f64a6..b8968cd386 100644 --- a/testsuite/a11y/lockbutton.txt +++ b/testsuite/a11y/lockbutton.txt @@ -1,7 +1,7 @@ window1 "window" index: 0 - state: enabled resizable sensitive showing visible + state: active enabled resizable sensitive showing visible toolkit: gtk window-type: normal @@ -14,7 +14,7 @@ window1 name: Lock description: Dialog is unlocked. Click to prevent further changes - state: enabled focusable sensitive showing visible has-tooltip + state: enabled focusable focused sensitive showing visible has-tooltip toolkit: gtk layer: widget diff --git a/testsuite/a11y/menubutton.txt b/testsuite/a11y/menubutton.txt index d9893ab868..ecfe438f70 100644 --- a/testsuite/a11y/menubutton.txt +++ b/testsuite/a11y/menubutton.txt @@ -1,7 +1,7 @@ window1 "frame" index: 0 - state: enabled resizable sensitive showing visible + state: active enabled resizable sensitive showing visible toolkit: gtk window-type: normal @@ -20,7 +20,7 @@ window1 parent: window1 index: 0 name: Menu - state: enabled focusable sensitive showing visible + state: enabled focusable focused sensitive showing visible toolkit: gtk layer: widget diff --git a/testsuite/a11y/menubutton2.txt b/testsuite/a11y/menubutton2.txt index e5d8cbb537..5dafe5000c 100644 --- a/testsuite/a11y/menubutton2.txt +++ b/testsuite/a11y/menubutton2.txt @@ -1,7 +1,7 @@ window1 "frame" index: 0 - state: enabled resizable sensitive showing visible + state: active enabled resizable sensitive showing visible toolkit: gtk window-type: normal @@ -89,7 +89,7 @@ window1 parent: window1 index: 0 name: Menu - state: enabled focusable sensitive showing visible + state: enabled focusable focused sensitive showing visible toolkit: gtk layer: widget diff --git a/testsuite/a11y/menubutton3.txt b/testsuite/a11y/menubutton3.txt index e5d8cbb537..5dafe5000c 100644 --- a/testsuite/a11y/menubutton3.txt +++ b/testsuite/a11y/menubutton3.txt @@ -1,7 +1,7 @@ window1 "frame" index: 0 - state: enabled resizable sensitive showing visible + state: active enabled resizable sensitive showing visible toolkit: gtk window-type: normal @@ -89,7 +89,7 @@ window1 parent: window1 index: 0 name: Menu - state: enabled focusable sensitive showing visible + state: enabled focusable focused sensitive showing visible toolkit: gtk layer: widget diff --git a/testsuite/a11y/menus.txt b/testsuite/a11y/menus.txt index 44ca3ddab9..ab89b99250 100644 --- a/testsuite/a11y/menus.txt +++ b/testsuite/a11y/menus.txt @@ -7,6 +7,14 @@ window1 layer: window alpha: 1 + unnamed-GtkContainerAccessible-0 + "panel" + parent: window1 + state: enabled sensitive showing visible + toolkit: gtk + + layer: widget + alpha: 1 menubar1 "menu bar" parent: window1 diff --git a/testsuite/a11y/mnemonic.txt b/testsuite/a11y/mnemonic.txt index 362afca174..cd95e32062 100644 --- a/testsuite/a11y/mnemonic.txt +++ b/testsuite/a11y/mnemonic.txt @@ -1,7 +1,7 @@ window1 "window" index: 0 - state: enabled resizable sensitive showing visible + state: active enabled resizable sensitive showing visible toolkit: gtk window-type: normal diff --git a/testsuite/a11y/notebook.txt b/testsuite/a11y/notebook.txt index 7cdd28ec0c..d2e50bf062 100644 --- a/testsuite/a11y/notebook.txt +++ b/testsuite/a11y/notebook.txt @@ -1,7 +1,7 @@ window1 "window" index: 0 - state: enabled resizable sensitive showing visible + state: active enabled resizable sensitive showing visible toolkit: gtk window-type: normal @@ -11,7 +11,7 @@ window1 "page tab list" parent: window1 index: 0 - state: enabled focusable sensitive showing visible + state: enabled focusable focused sensitive showing visible toolkit: gtk layer: widget diff --git a/testsuite/a11y/pickers.txt b/testsuite/a11y/pickers.txt index 7f457e374a..f6971e5bf2 100644 --- a/testsuite/a11y/pickers.txt +++ b/testsuite/a11y/pickers.txt @@ -1,7 +1,7 @@ window1 "window" index: 0 - state: enabled resizable sensitive showing visible + state: active enabled resizable sensitive showing visible toolkit: gtk window-type: normal diff --git a/testsuite/a11y/placeholder-text.txt b/testsuite/a11y/placeholder-text.txt index 8079c61f03..b8d9cd2f3e 100644 --- a/testsuite/a11y/placeholder-text.txt +++ b/testsuite/a11y/placeholder-text.txt @@ -1,7 +1,7 @@ window1 "window" index: 0 - state: enabled resizable sensitive showing visible + state: active enabled resizable sensitive showing visible toolkit: gtk window-type: normal @@ -20,7 +20,7 @@ window1 "text" parent: box1 index: 0 - state: editable enabled focusable sensitive showing single-line visible + state: editable enabled sensitive showing single-line visible toolkit: gtk placeholder-text: Subject or Addresses contain @@ -62,7 +62,7 @@ window1 "text" parent: box1 index: 1 - state: editable enabled focusable sensitive showing single-line visible + state: editable enabled sensitive showing single-line visible toolkit: gtk placeholder-text: Message contains @@ -104,7 +104,7 @@ window1 "text" parent: box1 index: 2 - state: editable enabled focusable sensitive showing single-line visible + state: editable enabled sensitive showing single-line visible toolkit: gtk placeholder-text: Body contains diff --git a/testsuite/a11y/range.txt b/testsuite/a11y/range.txt index be18a34fd2..e044e08dc8 100644 --- a/testsuite/a11y/range.txt +++ b/testsuite/a11y/range.txt @@ -1,7 +1,7 @@ window1 "window" index: 0 - state: enabled resizable sensitive showing visible + state: active enabled resizable sensitive showing visible toolkit: gtk window-type: normal @@ -21,7 +21,7 @@ window1 parent: grid1 index: 0 description: 45.5 - state: enabled focusable horizontal sensitive showing visible + state: enabled focusable focused horizontal sensitive showing visible toolkit: gtk layer: widget diff --git a/testsuite/a11y/scale-drawvalue.txt b/testsuite/a11y/scale-drawvalue.txt index 327b819ffa..c0f9915470 100644 --- a/testsuite/a11y/scale-drawvalue.txt +++ b/testsuite/a11y/scale-drawvalue.txt @@ -1,7 +1,7 @@ window1 "frame" index: 0 - state: enabled resizable sensitive showing visible + state: active enabled resizable sensitive showing visible toolkit: gtk window-type: normal @@ -20,7 +20,7 @@ window1 parent: window1 index: 0 description: -42.0 - state: enabled focusable horizontal sensitive showing visible + state: enabled focusable focused horizontal sensitive showing visible toolkit: gtk layer: widget diff --git a/testsuite/a11y/stack.txt b/testsuite/a11y/stack.txt index bb07325586..5d41385ccd 100644 --- a/testsuite/a11y/stack.txt +++ b/testsuite/a11y/stack.txt @@ -1,7 +1,7 @@ window1 "window" index: 0 - state: enabled resizable sensitive showing visible + state: active enabled resizable sensitive showing visible toolkit: gtk window-type: normal @@ -30,7 +30,7 @@ window1 parent: stackswitcher1 index: 0 name: Page 1 - state: checked enabled focusable sensitive showing visible + state: checked enabled focusable focused sensitive showing visible toolkit: gtk layer: widget diff --git a/testsuite/a11y/text.txt b/testsuite/a11y/text.txt index f69dfca29c..f873df4a99 100644 --- a/testsuite/a11y/text.txt +++ b/testsuite/a11y/text.txt @@ -1,7 +1,7 @@ window1 "window" index: 0 - state: enabled resizable sensitive showing visible + state: active enabled resizable sensitive showing visible toolkit: gtk window-type: normal @@ -11,7 +11,7 @@ window1 "text" parent: window1 index: 0 - state: editable enabled focusable multi-line sensitive showing visible + state: editable enabled focusable focused multi-line sensitive showing visible toolkit: gtk layer: widget diff --git a/testsuite/a11y/tooltips.txt b/testsuite/a11y/tooltips.txt index e2a0f3ed99..d351486336 100644 --- a/testsuite/a11y/tooltips.txt +++ b/testsuite/a11y/tooltips.txt @@ -1,7 +1,7 @@ window1 "frame" index: 0 - state: enabled resizable sensitive showing visible + state: active enabled resizable sensitive showing visible toolkit: gtk window-type: normal @@ -29,7 +29,7 @@ window1 parent: box1 index: 0 description: Tooltip1 - state: enabled focusable sensitive showing visible has-tooltip + state: enabled focusable focused sensitive showing visible has-tooltip toolkit: gtk layer: widget diff --git a/testsuite/a11y/tree.txt b/testsuite/a11y/tree.txt index c26c1a9c84..1ed8066958 100644 --- a/testsuite/a11y/tree.txt +++ b/testsuite/a11y/tree.txt @@ -1,7 +1,7 @@ window1 "window" index: 0 - state: enabled resizable sensitive showing visible + state: active enabled resizable sensitive showing visible toolkit: gtk window-type: normal @@ -11,7 +11,7 @@ window1 "table" parent: window1 index: 0 - state: enabled focusable sensitive showing visible manages-descendants + state: enabled focusable focused sensitive showing visible manages-descendants toolkit: gtk layer: widget @@ -48,7 +48,7 @@ window1 "table cell" parent: tv index: 1 - state: enabled focusable selectable selected sensitive showing transient visible + state: active enabled focusable focused selectable selected sensitive showing transient visible layer: widget alpha: 1 @@ -69,7 +69,7 @@ window1 parent: tv index: 0 name: One - state: enabled focusable selectable selected sensitive showing single-line transient visible + state: active enabled focusable focused selectable selected sensitive showing single-line transient visible layer: widget alpha: 1 @@ -118,7 +118,7 @@ window1 parent: tv index: 1 name: 234 - state: enabled focusable selectable selected sensitive showing single-line transient visible + state: active enabled focusable focused selectable selected sensitive showing single-line transient visible layer: widget alpha: 1 -- 2.30.2